common: include: Redo some includes for FreeBSD #15337
Conversation
wjwithagen
changed the title
There was a problem hiding this comment.
-
Could you please verify whether this PR follows the naming conventions for the PR Title and Commit Title ? They need change.
Please refer: https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#3-describe-your-changes -
My PRs for "Removing Redundant Headers" affects only the files inside src/common/ directory. But this PR contains "erasure-code" and "test" submodules and these are not re-added for sure. I usually create a separate PR for each submodule and especially the ones that has Separate logical changes (here: newly added, not reverted). You could consider that if it is not a hard for you.
-
If this PR does a revert, then please add the Tracker URL in the Commit Message and in the PR Description.
-
Update the tracker with the PR URLs.
| #include <unistd.h> | ||
| #if defined(__FreeBSD__) |
There was a problem hiding this comment.
Is there any problem making it similar ? I mean putting an #ifdef, which is similar to the other checks (linux)
There was a problem hiding this comment.
@joscollin
I've been using #if defined() for all my submissions.
This will allow me an easy grep to find all typical FreeBSD stuff.
And in the whole code there is a mismatch of all the possible forms.
|
|
||
| #include <arpa/inet.h> | ||
| #include <ifaddrs.h> | ||
| #include <stdlib.h> | ||
| #include <string.h> | ||
| #if defined(__FreeBSD__) | ||
| #include <sys/types.h> |
There was a problem hiding this comment.
I have just noticed that this is newly added. But It is fine, if it is necessary in FreeBSD.
| @@ -15,6 +15,9 @@ | |||
| #include <stdio.h> | |||
| #include <stdlib.h> | |||
| #include <string.h> | |||
| #if defined(__FreeBSD__) | |||
| #include <sys/wait.h> | |||
There was a problem hiding this comment.
I have just noticed that this is newly added. But It is fine, if it is necessary in FreeBSD.
There was a problem hiding this comment.
@joscollin
I'm not quite sure why these would be newly added.
The older version I have does have this include.
It even works without the #if
wjwithagen
changed the title
|
I'm undoing more than just your reorganisation. Hence the erasure code patch. And I'll do the tracker administration. |
- During include cleanup just a too bit much was removed for FreeBSD to get things compiled. This redoes some of the includes. Tracker: http://tracker.ceph.com/issues/19883 Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
- Buffer.h is needed to prevent Clang seriously complaining about missing and wrong forward declarations of ceph::buffer:ptr including buffer_fwd.h does not help. Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
wjwithagen
force-pushed
the
wip-wjw-freebsd-fix-includes
branch
from
4313f08
to
2f1b0c1
Compare
to get things compiled.
This redoes some of the includes.
Tracker: http://tracker.ceph.com/issues/19883
Signed-off-by: Willem Jan Withagen wjw@digiware.nl